From 821fc54a6dff8999094d155590ee31d6740d3abd Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 17 Jul 2009 01:32:50 +0000
Subject: [PATCH] Fix last change.

---
 src/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index d3b2ed805d9..ff8742f8be5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-07-17  Kenichi Handa  <handa@m17n.org>
 
 	* casetab.c (shuffle): Fix the logic of setting up the cycle.
-- 
2.30.2